From: Tim Vaughan <tgvaughan@gmail.com>
Date: Mon, 24 Jun 2019 21:21:07 +0000 (+0200)
Subject: Merge branch 'master' into manual
X-Git-Tag: v1.4.4~6
X-Git-Url: https://thelambdalab.xyz/gitweb/index.cgi?a=commitdiff_plain;h=e709905f4a3019372b2365e97019d7fd8741b125;p=elpher.git

Merge branch 'master' into manual
---

e709905f4a3019372b2365e97019d7fd8741b125