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

Conflicts:
	tests/PHPUnit/Integration/expected/test_csvExport__Live.getLastVisitsDetails_day.csv