Merge branch '8.x-1.x' into travis-yml-fix

Conflicts:
	.travis.yml