Check for the use of a CAPTCHA before trying to render it.
Merge branch 'master' into develop