Apply hstore patch v0.33 from Oleg.