Merge branch 'develop' into awhitening
authorPaul Brossier <piem@piem.org>
Wed, 3 Feb 2016 21:54:24 +0000 (22:54 +0100)
committerPaul Brossier <piem@piem.org>
Wed, 3 Feb 2016 21:54:24 +0000 (22:54 +0100)

Trivial merge