[#12653] Replaced captcha with honeypot
Merge branch 'master' into 12653-honeypot

Conflicts:
	agov.install
Merge pull request #101 from previousnext/12653-honeypot

[#12653] Replaced captcha with honeypot