Speed up travis build
Merge branch 'travis'