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