Travis: Initiating build for commit '493f7079fec15e7526c5a14d0f7d4ad84e843448' on branch 'report_and_dimension_refactoring': Merge remote-tracking branch 'origin/master' into report_and_dimension_refactoring

Conflicts:
	core/Tracker/Settings.php
	plugins/DBStats/DBStats.php