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

Conflicts:
	LEGALNOTICE