Merge branch '2.15.1' of https://github.com/ChrisADR/git-po into maint