Contributed by Stephen Gaudio.

Patch #408, added on June 11, 1997