Merge branch 'cipy-master'
authorPhil Howard <phil@gadgetoid.com>
Tue, 20 Aug 2019 15:15:32 +0000 (16:15 +0100)
committerPhil Howard <phil@gadgetoid.com>
Tue, 20 Aug 2019 15:15:32 +0000 (16:15 +0100)

Trivial merge