From: Tim Vaughan <tgvaughan@gmail.com>
Date: Sun, 23 Jun 2019 08:19:15 +0000 (+0200)
Subject: Merge branch 'master' into manual
X-Git-Tag: v1.4.4~13
X-Git-Url: https://thelambdalab.xyz/gitweb/index.cgi?a=commitdiff_plain;h=71b4b025b5c0450405aae3d342428cfd624ace01;p=elpher.git

Merge branch 'master' into manual
---

71b4b025b5c0450405aae3d342428cfd624ace01