Merge branch 'example' of github.com:phpbb-extensions/test-framework into example

Conflicts:
	tests/system/database_base_test.php