merge master
Merge pull request #437 from nla/js-alias-fixes

Js alias fixes
Merge branch 'master' into js-add-qa