Updating from 1.9.x
Adding new type called captch (merge from 1.9.x)