Merge branch 'release-2.0.2' v2.0.2
authorAlexander Vasarab <alexander@wylark.com>
Thu, 2 Jul 2020 20:03:43 +0000 (13:03 -0700)
committerAlexander Vasarab <alexander@wylark.com>
Thu, 2 Jul 2020 20:03:43 +0000 (13:03 -0700)

Trivial merge