Travis: Initiating build for commit 'ca12d9a9205f9d4cff6d886ab6f15673da43ee2b' on branch 'deprecate_usersettings': Merge branch 'master' into deprecate_usersettings

Conflicts:
	core/Version.php