am 429f8329: Merge "Fix extra and comment ordering in ZipEntry reading" into klp-dev

* commit '429f832994e6d6992b91eca3c8f9b7bcd9cb9a0f':
  Fix extra and comment ordering in ZipEntry reading