Merge branch 'master' into add-browsers-travis-wip

Conflicts:
	.travis.yml