Merge branch 'release-2.0.2' into develop
authorAlexander Vasarab <alexander@wylark.com>
Thu, 2 Jul 2020 20:05:51 +0000 (13:05 -0700)
committerAlexander Vasarab <alexander@wylark.com>
Thu, 2 Jul 2020 20:05:51 +0000 (13:05 -0700)

Trivial merge