Merge branch 'feature/c_tests'
authorPaul Brossier <piem@piem.org>
Thu, 29 Nov 2018 18:19:52 +0000 (19:19 +0100)
committerPaul Brossier <piem@piem.org>
Thu, 29 Nov 2018 18:19:52 +0000 (19:19 +0100)

Trivial merge