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

Conflicts:
	core/Version.php