Merge branch 'maint'

* maint:
  Remove corrupt manifest files so that they won't block direct mode hits
  Avoid creating empty file before creating new manifest file
  Compensate for bug in gzputc in zlib 1.2.5

Conflicts:
	manifest.c

diff --cc manifest.c
Simple merge

diff --cc test.sh
Simple merge