[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 55d4cb: Merge remote-tracking branch 'origin/QA_3_5'