Merge pull request #215 from libretro/kivutar/embedzlib