Update .travis.yml file
Merge branch 'master' into app-emulation/fig