Merge remote-tracking branch 'remotes/sbraz/pycountry'