Merge branch 'develop' into awhitening
authorPaul Brossier <piem@piem.org>
Thu, 13 Aug 2015 13:31:06 +0000 (15:31 +0200)
committerPaul Brossier <piem@piem.org>
Thu, 13 Aug 2015 13:31:06 +0000 (15:31 +0200)

Trivial merge