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