Travis: Initiating build for commit '3ae28d92c086e9560310d64c2ed1da4be771000f' on branch 'tests_refactor': Merge branch 'master' into tests_refactor

Conflicts:
	tests/PHPUnit/IntegrationTestCase.php