Merge branch 'jonas-schievink-patch-1'
authorjoan <joan@abyz.co.uk>
Sun, 4 Feb 2018 10:07:16 +0000 (10:07 +0000)
committerjoan <joan@abyz.co.uk>
Sun, 4 Feb 2018 10:07:16 +0000 (10:07 +0000)

Trivial merge