Hi, Pieter.  I applied this patch to the release-candidate/0.6 branch.
Thanks for sending it in, and fixing it up.

jamie.