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

Conflicts:
	.travis.yml
	composer.json
That's what's causing the error, so yay for Travis catching that issue :)