[phpMyAdmin Git] [phpmyadmin/phpmyadmin] e6d72f: Fix merge issues