Pull in updates from node v0.9.11