Restore missing make code in javascript branch
Merge commit '088d3f631907fb3983400b41648be7a076c28ea1' into javascript-experiment