[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 047c41: Merge remote-tracking branch 'origin/QA_3_4' into ...