Merge branch 'master' into dirty_encoding_ignore
Merge branch 'dirty_encoding_ignore' of github.com:Rafiot/python-gnupg into dirty_encoding_ignore