Merge branch 'release-2.1.0' v2.1.0
authorAlexander Vasarab <alexander@wylark.com>
Thu, 19 Nov 2020 00:49:49 +0000 (16:49 -0800)
committerAlexander Vasarab <alexander@wylark.com>
Thu, 19 Nov 2020 00:49:49 +0000 (16:49 -0800)

Trivial merge