Merge branch 'fix/awhitening'
authorPaul Brossier <piem@piem.org>
Thu, 6 Dec 2018 12:49:25 +0000 (13:49 +0100)
committerPaul Brossier <piem@piem.org>
Thu, 6 Dec 2018 12:49:25 +0000 (13:49 +0100)

Trivial merge