Contributed by Jeff Hague.

Patch #901, added on December 17, 1998