merge inopinatus/hstore_array_fix