hstore build fix
Merge branch '002_hstore-build-fix' into extend