Travis: Initiating build for commit 'bc4c240385d51b91419f3484819dfc7e35eaf261' on branch 'report_and_dimension_refactoring': Merge branch 'master' into report_and_dimension_refactoring

Conflicts:
	core/FrontController.php
	core/Log.php
	plugins/API/API.php
	tests/PHPUnit/Fixture.php
	tests/PHPUnit/UI