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

Conflicts:
	core/Version.php