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

Conflicts:
	core/Updates/0.4.2.php
	core/Updates/0.6.3.php
	core/Updates/1.2-rc1.php
	core/Updates/1.9-b9.php
	core/Version.php
	tests/PHPUnit/Fixture.php
	tests/PHPUnit/Fixtures/UITestFixture.php
	tests/PHPUnit/Integration/Core/JsProxyTest.php