#482: node_modules, merge master