Fix .travis.yml again
Merge branch 'master' into sc-titles