Travis: Initiating build for commit '524565eb40d8c20080d345be80610ccdea11d8af' on branch 'log-refactoring-1': Merge branch 'master' into log-refactoring-1

Conflicts:
	composer.json
	composer.lock
	config/global.php
	core/Container/StaticContainer.php