Merge branch 'v1.1-dev' as v1.1.0 v1.1.0
authorJustin Wind <justin.wind+git@gmail.com>
Mon, 9 Aug 2021 16:23:17 +0000 (09:23 -0700)
committerJustin Wind <justin.wind+git@gmail.com>
Mon, 9 Aug 2021 16:23:17 +0000 (09:23 -0700)

Trivial merge