Fix coding style
Fix coding style
Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin