fixed serialization
Merge branch 'hstore' into integration