Merge branch 'awhitening'
authorPaul Brossier <piem@piem.org>
Wed, 5 Apr 2017 09:49:57 +0000 (11:49 +0200)
committerPaul Brossier <piem@piem.org>
Wed, 5 Apr 2017 09:49:57 +0000 (11:49 +0200)

Trivial merge