Try based on https://gist.github.com/BanzaiMan/6a6b035d45db4f8098a4
Merge branch 'master' into release

Conflicts:
	.travis.yml