Travis: Initiating build for commit '1cd924d0371a2271798279b78e30585f4c7a80d9' on branch 'php-di': Merge branch 'master' into php-di

Conflicts:
	composer.json
	composer.lock