Merge branch 'master' into next

* master:
Remove old "git-grep.sh" remnants
merge-base: Clarify the comments on post processing.
Update the documentation for git-merge-base

diff --cc Makefile
Simple merge