Merge branch 'feature/captcha-support' into 'master'

Feature/captcha support

See merge request !100
4 jobs for master in 4 minutes and 57 seconds (queued for 1 second)