Merge branch 'develop' into awhitening
authorPaul Brossier <piem@piem.org>
Sun, 6 Sep 2015 08:48:24 +0000 (10:48 +0200)
committerPaul Brossier <piem@piem.org>
Sun, 6 Sep 2015 08:48:24 +0000 (10:48 +0200)

Trivial merge