Merge branch 'v1.2-dev' as v1.2.2 v1.2-dev v1.2.2
authorJustin Wind <justin.wind+git@gmail.com>
Tue, 5 Oct 2021 23:50:43 +0000 (16:50 -0700)
committerJustin Wind <justin.wind+git@gmail.com>
Tue, 5 Oct 2021 23:50:43 +0000 (16:50 -0700)

Trivial merge