[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 3fe37f: Merge branch 'MAINT_3_5_4' into QA_3_5