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

Conflicts:
	tests/PHPUnit/Integration/LogTest.php