Merge commit '94218e5093f6182a173b954d82a892877fcef08a' into subtree-updates

Conflicts:
	contrib/subtree/Makefile
	contrib/subtree/git-subtree.sh
	contrib/subtree/git-subtree.txt
	contrib/subtree/t/t7900-subtree.sh