[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 591ba7: Merge branch 'MAINT_3_5_6' into QA_3_5