Merge branch 'master' of https://github.com/Softcatala/git-po into maint