am 3e13ed08: Merge "Cleanup ziparchive"

* commit '3e13ed0864944c5fcff9d519eacf1f75c7db652a':
  Cleanup ziparchive