WinoCapcha rebase
Rebase winocaptcha
Merge branch 'master' into tipwire

Conflicts:
	WinoCaptcha