V68+: Merge branch 'plugwash-master'
authorjoan2937 <joan@abyz.me.uk>
Fri, 9 Nov 2018 08:49:53 +0000 (08:49 +0000)
committerjoan2937 <joan@abyz.me.uk>
Fri, 9 Nov 2018 08:49:53 +0000 (08:49 +0000)

Trivial merge