Remove special-casing of GnuPG
Merge branch 'encryption'

* encryption:
  Remove special-casing of GnuPG