Merge branch 'v1.2-dev' as v1.2.0 v1.2.0
authorJustin Wind <justin.wind+git@gmail.com>
Sat, 28 Aug 2021 17:04:08 +0000 (10:04 -0700)
committerJustin Wind <justin.wind+git@gmail.com>
Sat, 28 Aug 2021 17:04:08 +0000 (10:04 -0700)

Trivial merge