Update gpg settings as requested in #497
Merge branch 'jm/gpg' PR #567