Update .travis.yml [ci skip]
Merge branch 'master' into master_nutty_modifyfilenames