check files work
Merge branch 'master' into js-dsc240
handle misnamed files correctly
Merge branch 'master' into js-dsc240
Merge pull request #748 from nla/js-dsc240

Js dsc240