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

Conflicts:
	plugins/CoreConsole/Commands/TestsRun.php