Travis: Initiating build for commit '1ac11574a40740f0fda262ef6e4d78c67ea7fc8f' on branch 'comparison_dashboard_changes': Merge branch 'master' into comparison_dashboard_changes

Conflicts:
	plugins/SegmentEditor/SegmentSelectorControl.php