semicolon
Merge branch 'master' into quick

Conflicts:
	.travis.yml