Travis: Initiating build for commit 'd923ba93e59ed334e69a4e3f795f0ca940f23bf9' on branch 'deprecate_usersettings': Merge remote-tracking branch 'origin/master' into deprecate_usersettings

Conflicts:
	composer.lock
	core/Version.php
	tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml
	tests/PHPUnit/Integration/expected/test_csvExport__Live.getLastVisitsDetails_day.csv