Merge pull request #964 from kenyon/use-modern-os-facts