Merge branch 'feature/dct_multiopt'
authorPaul Brossier <piem@piem.org>
Sat, 15 Sep 2018 15:31:46 +0000 (17:31 +0200)
committerPaul Brossier <piem@piem.org>
Sat, 15 Sep 2018 15:31:46 +0000 (17:31 +0200)

Trivial merge