yet another test of the travis push
Merge branch 'master' into macosx