Fix USES_NPM conditional
Merge branch 'master' into admit