attempting to diagnose build failure
attempting to fix build
fixing build, another attempt
Merge branch 'master' into tests_fixture_refactor

Conflicts:
	tests/PHPUnit/Integration/ManyVisitorsOneWebsiteTest.php
Forgot to convert some tests & remove functions from integrationtestcase.
Renamed fixtures and use glob to include them.