Merge branch 'patch-1' into WIZARDISHUNGRY-patch-1
authorPaul Brossier <piem@piem.org>
Tue, 6 Feb 2018 21:59:01 +0000 (22:59 +0100)
committerPaul Brossier <piem@piem.org>
Tue, 6 Feb 2018 21:59:01 +0000 (22:59 +0100)

Trivial merge