From: funilrys <redacted>
Date: Sun, 7 Jun 2020 16:04:21 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master' into issue-1166-bis
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=6a216bf28dcd3cc0d0e5b3b0a5afb23058ce58fa;p=stevenblack-hosts.git

Merge remote-tracking branch 'upstream/master' into issue-1166-bis
---

6a216bf28dcd3cc0d0e5b3b0a5afb23058ce58fa