This has now been fixed in the HEAD repository, pending a patch to the 6.1 branch.  Thanks for the report.