* fix .travis.yml
Merge branch 'master' into develop

* master:
  * fix .travis.yml

Conflicts:
	.travis.yml