adding minimal diagnostics to git push
Merge branch 'master' into macosx