Merge branch 'yinfast'
authorPaul Brossier <piem@piem.org>
Mon, 24 Jul 2017 12:13:52 +0000 (14:13 +0200)
committerPaul Brossier <piem@piem.org>
Mon, 24 Jul 2017 12:13:52 +0000 (14:13 +0200)

Trivial merge