Use $GNUPGHOME if it exists
Merge remote-tracking branch 'upstream/master'