Merge branch 'master' into jc/globfetch

This is to pick up the fix made on master:

git-fetch: exit with non-zero status when fast-forward check fails

diff --cc git-fetch.sh
Simple merge