initial fix WIP
Some fixes.
Merge branch 'v0.11' into race_condition
Merge remote-tracking branch 'upstream/master' into race_condition
Cleanup
Merge branch 'race_condition'

Conflicts:
	nan.h
Merge branch 'v0.11'
Merge branch 'v0.11'