Merge branch 'ds/maint-deflatebound' into maint

* ds/maint-deflatebound:
  Improve accuracy of check for presence of deflateBound.

diff --cc Makefile
Simple merge

diff --cc cache.h
Simple merge