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

Trivial merge