Merge branch 'travis' into rollup

Conflicts:
	.travis.yml