Bug 935114 - Node 'os'
Merge pull request #1337 from jsantell/node-os

Fixes Bug 935114 - Node 'os', r=@erikvold