Contributed by Stephen and Matthew Gaudio.

Patch #806, added on September 6, 1998