This is now fixed in the repository, awaiting patch to 6.1 branch.  Thanks for the report.