Merge branch 'BjoernSch-master'
authorjoan <joan@abyz.co.uk>
Sun, 14 Aug 2016 09:46:54 +0000 (10:46 +0100)
committerjoan <joan@abyz.co.uk>
Sun, 14 Aug 2016 09:46:54 +0000 (10:46 +0100)

Trivial merge