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

Trivial merge