Merge branch 'elliotparis' master
authorPaul Brossier <piem@piem.org>
Wed, 29 Mar 2017 08:17:34 +0000 (10:17 +0200)
committerPaul Brossier <piem@piem.org>
Wed, 29 Mar 2017 08:17:34 +0000 (10:17 +0200)

Trivial merge