fix defects for 1105
Merge remote-tracking branch 'origin/nn-dsc-1103' into js-dsc-1105
Merge branch 'master' into js-dsc-1105
fix uploading to non-page things
Merge pull request #855 from nla/js-dsc-1105

Js dsc 1105