Merge branch 'release-3.0.0' into develop
authorAlexander Vasarab <alexander@wylark.com>
Mon, 30 Nov 2020 01:40:36 +0000 (17:40 -0800)
committerAlexander Vasarab <alexander@wylark.com>
Mon, 30 Nov 2020 01:40:36 +0000 (17:40 -0800)

Trivial merge