[phpMyAdmin Git] [phpmyadmin/phpmyadmin] ba3590: Merge branch 'origin/QA_5_1' into master