Update .travis.yml
Merge branch 'master' into travis-sandbox

Conflicts:
	.travis.yml