V67+: Merge branch 'Noviv-master'
authorjoan <joan@abyz.me.uk>
Sun, 21 Oct 2018 08:26:11 +0000 (09:26 +0100)
committerjoan <joan@abyz.me.uk>
Sun, 21 Oct 2018 08:26:11 +0000 (09:26 +0100)

Trivial merge