Merge branch 't8_tag'
ticket:6 change email field to EmailField
Merge branch 't6_widget'
merge
Merge branch 'master' into t8_tag