Merge branch 'upstream' at 0.8.0
authorSteve McIntyre <steve@einval.com>
Wed, 20 Nov 2019 01:49:23 +0000 (01:49 +0000)
committerSteve McIntyre <steve@einval.com>
Wed, 20 Nov 2019 01:49:23 +0000 (01:49 +0000)

Trivial merge