a minor edit in Makefile.config
Merge remote-tracking branch 'upstream/master'

Merge with upstream.