Merge pull request #1018 from sipa/gpg