Merge base-installer (1.195) import into refs/heads/workingbranch
authorHolger Wansing <hwansing@mailbox.org>
Sun, 12 Jul 2020 11:30:23 +0000 (12:30 +0100)
committerHolger Wansing <hwansing@mailbox.org>
Sun, 12 Jul 2020 11:30:23 +0000 (12:30 +0100)

Trivial merge