merge conflict
use norobots for captcha (re #324)