Merged with latest Hilary master

Merged with latest Hilary master, which includes the fix for `require('util')`.