Merge branch 'v1.2-dev' as v1.2.0 v1.2.0
authorJustin Wind <justin.wind+git@gmail.com>
Fri, 10 Sep 2021 18:29:27 +0000 (11:29 -0700)
committerJustin Wind <justin.wind+git@gmail.com>
Fri, 10 Sep 2021 18:29:27 +0000 (11:29 -0700)

Trivial merge