ref: ed596f7df20df54e45e0a0bd76da6d9cb98ad67f
parent: f9400d0a209858397aaf3f8dfc5d754e1a4ecf3f
parent: 4bc10e20d16aaaefc7d6b4942a666facddd8e090
author: Paul Brossier <piem@piem.org>
date: Tue Oct 30 09:22:44 EDT 2018
Merge branch 'master' into feature/docstrings