Backport .travis.yml
Merge branch 'development'

Conflicts:
	.travis.yml
Merge remote-tracking branch 'upstream/master' into development