Redo 28b669a1aa3f
Merge branch 'master' of github.com:phpmyadmin/phpmyadmin
Merge branch 'master' of github.com:phpmyadmin/phpmyadmin