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

Conflicts:
	tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml