Remove trailing white spaces
Remove more trailing white spaces
Merge branch 'master' of github.com:phpmyadmin/phpmyadmin