travis only for master
Merge branch 'master' into osx_fix