Merge remote-tracking branches 'gl/dgobbi/15934-meta-writer-update' and...

Merge remote-tracking branches 'gl/dgobbi/15934-meta-writer-update' and 'gl/dgobbi/zlib-mangle-z_errmsg' into release

* gl/dgobbi/15934-meta-writer-update:
  Bug 15934: vtkMetaImageWriter incorrect voxel spacing and origin

* gl/dgobbi/zlib-mangle-z_errmsg:
  zlib 2016-01-20 (bfc811e0)
  Merge branch 'upstream-zlib' into update-zlib