[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 9ac917: Merge branch 'MAINT_3_5_5' into QA_3_5