Fix travis config
Merge branch 'master' into travis.macosx