chore(release): Merge branch '1.9' into 1.10

Conflicts:
	.travis.yml
	composer.json
Need to add sniffs back, it looks like.