Merge branch 'zip64_optional' (fixes #12)