ref: 74c1fb9a63dfa46c0591816bd2f450c5f2dba751
parent: c1ba75b55fb6351ca1f2dcebf89b93aee72d2711
parent: fda33947f11900fca0c3704a654d9afa6fc52224
author: Paul Brossier <piem@piem.org>
date: Wed Dec 19 12:50:42 EST 2018
Merge branch 'master' into feature/pytest