Donated by Peter Rasmussem.

Patch #1536, added on September 3, 2005.