Merge branch 'v1.2-dev' as v1.2.1 v1.2.1
authorJustin Wind <justin.wind+git@gmail.com>
Fri, 22 Oct 2021 23:16:59 +0000 (16:16 -0700)
committerJustin Wind <justin.wind+git@gmail.com>
Fri, 22 Oct 2021 23:16:59 +0000 (16:16 -0700)

Trivial merge