ref: 155cc10b5cde76184291c01fe8723328f0e36430
parent: 00d0275bc3279e523ce21d183884d24024dfbff8
parent: 67b66184a3c5ac1bc2d2bc837bc5b1f192f10b15
author: Paul Brossier <piem@piem.org>
date: Fri Mar 10 09:26:32 EST 2017
Merge branch 'master' into awhitening