Travis: Initiating build for commit 'c89189697b9cd17a5c2df0f3794b12f5cb681655' on branch '5940_testRenamingAndCorrectFolders': Merge branch 'master' into 5940_testRenamingAndCorrectFolders

Conflicts:
	tests/PHPUnit/phpunit.xml.dist