Contributed by Stephen and Matthew Gaudio.

Patch #651, added on Feb. 26, 1998