[Fix #732] Replace $GREP_OPTIONS with an alias
Merge branch 'master' into local_config