Merge branch 'QA_4_0' of github.com:phpmyadmin/phpmyadmin into Bug3970

Conflicts:
	ChangeLog
Merge pull request #424 from kasunchathuranga/Bug3970

Fix bug 3970 - Pressing enter in the filter field reloads page
bug #3984 Cannot insert in this table (PHP < 5.4)
Merge commit 'e3f0dcc'
Merge branch 'QA_4_0'