Merge pull request #821 from nla/js-dsc-242

Js dsc 242
Merge branch 'master' into js-dsc-242