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

Conflicts:
	core/Session.php