upgrade to 1.1.70
Merge branch 'master' into js-Journal-upload

* master:
  upgrade to 1.1.70