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

Conflicts:
	core/Version.php