[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 346820: Merge pull request #1364 from smita786/QA_4_2