Fix compilation error where zconf.h would not be found.

Thanks to Aaron Boxer for report on the ML
Merge branch 'release'