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