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