apply hstore-patch to 4-0-stable