[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 70fbae: Merge commit '89d57f8'