[Phpmyadmin-git] [phpmyadmin/phpmyadmin] bd9421: Merge remote-tracking branch 'origin/master'