Merge branch 'develop' into awhitening
authorPaul Brossier <piem@piem.org>
Mon, 2 Nov 2015 22:16:24 +0000 (23:16 +0100)
committerPaul Brossier <piem@piem.org>
Mon, 2 Nov 2015 22:16:24 +0000 (23:16 +0100)

Trivial merge