Merge branch 'emuell-yin_confidence'
authorPaul Brossier <piem@piem.org>
Sun, 1 Oct 2017 09:46:29 +0000 (11:46 +0200)
committerPaul Brossier <piem@piem.org>
Sun, 1 Oct 2017 09:46:29 +0000 (11:46 +0200)

Trivial merge