Merge branch 'v1.2-dev' as v1.2.6 v1.2.6
authorJustin Wind <justin.wind+git@gmail.com>
Fri, 29 Apr 2022 16:21:51 +0000 (09:21 -0700)
committerJustin Wind <justin.wind+git@gmail.com>
Fri, 29 Apr 2022 16:21:51 +0000 (09:21 -0700)

Trivial merge