r1810: Patch from Richard Renard <rrenard@idealx.com> to store