Update .travis.yml
Merge branch 'master' into travis
Merge branch 'release-1.3' into travis

Conflicts:
	.travis.yml
Merge branch 'release-1.3' into travis
Merge branch 'travis' into release-1.3