Merge branch 'develop' into awhitening
authorPaul Brossier <piem@piem.org>
Sun, 25 Oct 2015 10:32:21 +0000 (11:32 +0100)
committerPaul Brossier <piem@piem.org>
Sun, 25 Oct 2015 10:32:21 +0000 (11:32 +0100)

Trivial merge