I've included the patch in a test branch and will run it through the automated testing once before merging into master.