Fix https://www.illumos.org/issues/3880
Merge pull request #78 from pyhalov/complex_h

Fix https://www.illumos.org/issues/3880
Workaround for https://www.illumos.org/issues/3880 should not be necessary now
Merge pull request #79 from pyhalov/imagemagick

Remove workaround for https://www.illumos.org/issues/3880 from imagemagick
Merge remote-tracking branch 'upstream/oi/hipster' into zlib