Merge base-installer (1.189) import into refs/heads/workingbranch
authorBen Hutchings <ben@decadent.org.uk>
Sun, 30 Jun 2019 15:53:44 +0000 (16:53 +0100)
committerBen Hutchings <ben@decadent.org.uk>
Sun, 30 Jun 2019 15:53:44 +0000 (16:53 +0100)

Trivial merge