Merge branch of github.com:ChrisADR/git-po into master