ref: 568fc6056c256200f7ccec8e6e50230b0e8822fb
parent: a9e3bd03b1c01cc4974e7b0a7a9fa49c0a19caf4
parent: bc1ed6368f0057be27c5aea0267e94f79884acea
author: Paul Brossier <piem@piem.org>
date: Mon Nov 5 10:43:02 EST 2018
Merge branch 'master' into feature/pytest