Allow js
Merge branch 'master' into JBLong
a