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