Rebase recaptcha fix into sakai-10.x branch

This is just a rebase of #9.