Adding support for Email/Hidden/Telephone text boxes.
Merge remote-tracking branch 'origin/master'