Merge branch 'v1.2-dev' as v1.2.2 v1.2.2
authorJustin Wind <justin.wind+git@gmail.com>
Fri, 29 Oct 2021 20:45:46 +0000 (13:45 -0700)
committerJustin Wind <justin.wind+git@gmail.com>
Fri, 29 Oct 2021 20:45:46 +0000 (13:45 -0700)

Trivial merge