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