Contributed by Stephen and Matthew Gaudio.

Patch #776, added on July 6, 1998