[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 40cc4a: Fix merge issue