left while fixing bug#3936
Merge branch 'QA_4_0' of github.com:phpmyadmin/phpmyadmin into QA_4_0