* more .travis.yml tweaks
Merge branch 'master' into develop

* master:
  * more .travis.yml tweaks

Conflicts:
	.travis.yml