Use $GNUPGHOME if it exists
[Fix #732] Replace $GREP_OPTIONS with an alias
Merge branch 'master' into aminb
update from upstream