Merge branch 'maint-1.6.0' into maint

* maint-1.6.0:
  Clear the delta base cache during fast-import checkpoint

diff --cc cache.h
Simple merge

diff --cc fast-import.c
Simple merge

diff --cc sha1_file.c
Simple merge