[Fix #732] Replace $GREP_OPTIONS with an alias
Merge remote-tracking branch 'upstream/master'