Merge branch 'master' into js/merge-base

This is to pull in the object-hash clean-up from the master branch.

diff --cc object.c
index 9caba4fac857d82e12416b3d579aa4fe79722e1f,37277f94384fff1320381a370dd4d6c91a4ded2c..1c3675971599c1edfbc5752e2a56dce1a2322e7c
--- 1/object.c
--- 2/object.c
+++ b/object.c
@@@ -217,12 -235,3 +235,12 @@@ void add_object_array(struct object *ob
        objects[nr].name = name;
        array->nr = ++nr;
  }
-       for (i = 0; i < obj_allocs; i++)
-               if (objs[i])
-                       objs[i]->flags &= ~mark;
 +
 +void clear_object_marks(unsigned mark)
 +{
 +      int i;
 +
++      for (i = 0; i < obj_hash_size; i++)
++              if (obj_hash[i])
++                      obj_hash[i]->flags &= ~mark;
 +}

diff --cc object.h
Simple merge

diff --cc revision.c
Simple merge