Merge pull request #1020 from simondeziel/optional-gnupg