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

Conflicts:
	tests/PHPUnit/Integration/LogTest.php