[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 4770f7: Merge commit '3d6362a' into QA_4_2