Sync with 1.7.8.5

diff --cc Makefile
Simple merge

diff --cc grep.c
Simple merge

diff --cc t/t4150-am.sh
Simple merge