blah
Merge branch 'master' into release

Conflicts:
	.travis.yml