Merging master to node-0.10