Fix test failures
Merge branch 'master' of github.com:phpmyadmin/phpmyadmin