bug #3975 Table grouping isn't implemented properly
Merge branch 'QA_4_0'

Conflicts:
	libraries/db_info.inc.php