fix tests
Merge branch 'master' into js-upload-from-filesystem
Merge pull request #433 from nla/js-upload-from-filesystem

Js upload from filesystem