ref: f264b173a447448e0e124df2ac309b5e482e02c9
parent: 60fc05b3fadd7da5957eb8c531bfa882d35e6568
parent: 6769586029891c240afe04dec96f7c554e3803bd
author: Paul Brossier <piem@piem.org>
date: Wed Jun 22 09:00:10 EDT 2016
Merge branch 'master' into notes