Merge branch 'master' into dct
authorPaul Brossier <piem@piem.org>
Sat, 16 Sep 2017 21:55:51 +0000 (23:55 +0200)
committerPaul Brossier <piem@piem.org>
Sat, 16 Sep 2017 21:55:51 +0000 (23:55 +0200)

Trivial merge