Travis: Initiating build for commit '7f7cc482e54158bf3478cebb5359a2ec0bc58ec9' on branch 'di-config': Merge branch 'master' into di-config

Conflicts:
	core/FrontController.php