Merge branch 'release-2.3.0' master v2.3.0
authorAlexander Vasarab <alexander@wylark.com>
Fri, 10 Jul 2020 17:42:46 +0000 (10:42 -0700)
committerAlexander Vasarab <alexander@wylark.com>
Fri, 10 Jul 2020 17:42:46 +0000 (10:42 -0700)

Trivial merge