Merge base-installer (1.182) import into refs/heads/workingbranch
authorHolger Wansing <hwansing@mailbox.org>
Fri, 10 Aug 2018 20:28:14 +0000 (21:28 +0100)
committerHolger Wansing <hwansing@mailbox.org>
Fri, 10 Aug 2018 20:28:14 +0000 (21:28 +0100)

Trivial merge