Travis: Initiating build for commit '3676137b51f810f9f60d6c5e40d985acf04cb62f' on branch 'master': Merge remote-tracking branch 'origin/master'

Conflicts:
	core/Config.php