Merge branch 'master' into awhitening
authorPaul Brossier <piem@piem.org>
Sun, 26 Mar 2017 15:49:46 +0000 (17:49 +0200)
committerPaul Brossier <piem@piem.org>
Sun, 26 Mar 2017 15:49:46 +0000 (17:49 +0200)

Trivial merge