Merge branch 'development' into node-v0.10