Travis: Initiating build for commit '0c80a9be897972650d3e176943c0c63fcddcd6ca' on branch 'tmp-path': Merge branch 'di-config' into tmp-path

Conflicts:
	tests/PHPUnit/Integration/LogTest.php