Fix failing tests
Merge branch 'QA_4_0'

Conflicts:
	test/classes/PMA_DisplayResults_test.php