Merge base-installer (1.169) import into refs/heads/workingbranch
authorBen Hutchings <ben@decadent.org.uk>
Wed, 31 May 2017 17:19:10 +0000 (17:19 +0000)
committerBen Hutchings <ben@decadent.org.uk>
Wed, 31 May 2017 17:19:10 +0000 (17:19 +0000)

Trivial merge