Merge pull request #1 from phpmyadmin/master

Updated