partial port
Merge branch 'lockdown' into nodejs-0.10.0
v0.10.x in travis