Merge base-installer (1.184) import into refs/heads/workingbranch
authorHolger Wansing <hwansing@mailbox.org>
Mon, 29 Oct 2018 22:16:54 +0000 (22:16 +0000)
committerHolger Wansing <hwansing@mailbox.org>
Mon, 29 Oct 2018 22:16:54 +0000 (22:16 +0000)

Trivial merge