Merge branch 'maihde-issue-189'
authorjoan <joan@abyz.co.uk>
Sun, 4 Feb 2018 10:22:39 +0000 (10:22 +0000)
committerjoan <joan@abyz.co.uk>
Sun, 4 Feb 2018 10:22:39 +0000 (10:22 +0000)

Trivial merge