We do not want to scan captcha lib for errors
Coding style improvements
Use shorter notion of server array
Merge branch 'master' of github.com:phpmyadmin/phpmyadmin