Merge branch 'fix-travis-build'