minor improvement to git push diagnostics
Merge branch 'master' into macosx