Merge branch 'next' of github.com:ChrisADR/git-po