hstoreeeee
fixes
double emails
Merge branch 'version_3_2' into version_3_3
Merge branch 'version_3_3' into version_4_0