Another WinoCaptcha pull

Hope I got it right this time
Merge branch 'master' into tipwire