Feature #557 CAPTCHA Options
Merge remote-tracking branch 'upstream/feature' into feature-557
Merge pull request #794 from PaulBender/feature-557

Feature #557 CAPTCHA Options