This patch was written by Michael Muller.