Travis: Initiating build for commit '7e6afac0104e2a873fbe11179863f71bc83701a3' on branch '5807': Merge branch 'master' into 5807

Conflicts:
	.travis.yml
	tests/PHPUnit/UI