merge with python-gnupg

Imported from bugseverywhere, created on 2013-10-20