checkout master after the push
Merge branch 'master' into macosx