Keith Marshall - 2013-02-04

This has been dragging on far too long, with no response from Chuck, so I've applied and published the easy fix.

Chuck, if you prefer an alternative solution, please feel free to implement it later.