Wrap some long lines
Wrap more long lines
Merge branch 'master' of github.com:phpmyadmin/phpmyadmin