Merge branch 'zip-stream-test'
authorChristian Herdtweck <christian.herdtweck@intra2net.com>
Mon, 8 Oct 2018 07:39:38 +0000 (09:39 +0200)
committerChristian Herdtweck <christian.herdtweck@intra2net.com>
Mon, 8 Oct 2018 07:39:38 +0000 (09:39 +0200)

Trivial merge