Merge zimlib (4.0.4-5+rpi1) import into refs/heads/workingbranch
authorPeter Michael Green <plugwash@raspbian.org>
Fri, 18 Jan 2019 22:43:45 +0000 (22:43 +0000)
committerPeter Michael Green <plugwash@raspbian.org>
Fri, 18 Jan 2019 22:43:45 +0000 (22:43 +0000)

Trivial merge