Merge remote branch 'origin/master'

* origin/master:
  cmd/web: stream large files asynchronously.
  cmd/save: oops, missing a mangle_name() call.

diff --combined cmd/save-cmd.py
index e9b6e9e9ec8e7738e21712918e2067fd6eebe000,5eaa5d969a72c2cd24a862df33dd762deca9891a..4477894fefa7035ede49a45d3c451a8cbe9784ee
--- 1/cmd/save-cmd.py
--- 2/cmd/save-cmd.py
+++ b/cmd/save-cmd.py
@@@ -79,7 -79,9 +79,9 @@@ def _pop(force_tree)
      shalist = shalists.pop()
      tree = force_tree or w.new_tree(shalist)
      if shalists:
-         shalists[-1].append(('40000', part, tree))
+         shalists[-1].append(('40000',
+                              git.mangle_name(part, 040000, 40000),
+                              tree))
      else:  # this was the toplevel, so put it back for sanity
          shalists.append(shalist)
      return tree
@@@ -239,7 -241,7 +241,7 @@@ for (transname,ent) in r.filter(extra, 
                  add_error(e)
                  lastskip_name = ent.name
              else:
 -                (mode, id) = hashsplit.split_to_blob_or_tree(w, [f])
 +                (mode, id) = hashsplit.split_to_blob_or_tree(w, [f], False)
          else:
              if stat.S_ISDIR(ent.mode):
                  assert(0)  # handled above