fix text
fix text
Merge remote-tracking branch 'origin/master' into backport/node_v0.10