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