Add patch from Bill for the new root version.
Merge pull request #635 from ktf/bill-patch

Add patch from Bill for the new root version.