Merge branch 'master' into notes
authorPaul Brossier <piem@piem.org>
Wed, 22 Jun 2016 11:00:10 +0000 (13:00 +0200)
committerPaul Brossier <piem@piem.org>
Wed, 22 Jun 2016 11:00:10 +0000 (13:00 +0200)

Trivial merge