V70+: Merge branch 'CreaValix-master'
authorjoan2937 <joan@abyz.me.uk>
Fri, 9 Aug 2019 20:21:27 +0000 (21:21 +0100)
committerjoan2937 <joan@abyz.me.uk>
Fri, 9 Aug 2019 20:21:27 +0000 (21:21 +0100)

Trivial merge