Merge branch 'v1.2-dev' as v1.2.4 v1.2.4
authorJustin Wind <justin.wind+git@gmail.com>
Fri, 21 Jan 2022 18:37:58 +0000 (10:37 -0800)
committerJustin Wind <justin.wind+git@gmail.com>
Fri, 21 Jan 2022 18:37:58 +0000 (10:37 -0800)

Trivial merge