Merge branch 'master' into feature/cnn
authorPaul Brossier <piem@piem.org>
Mon, 31 Dec 2018 20:48:19 +0000 (21:48 +0100)
committerPaul Brossier <piem@piem.org>
Mon, 31 Dec 2018 20:48:19 +0000 (21:48 +0100)

Trivial merge