From: funilrys <redacted>
Date: Sun, 4 Mar 2018 10:19:36 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master' into encoding-review
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=0166642e004473fdfc74287e98dadc52d303eebc;p=stevenblack-hosts.git

Merge remote-tracking branch 'upstream/master' into encoding-review
---

0166642e004473fdfc74287e98dadc52d303eebc