Merge branch 'gui' v2.2.0
authorAlexander Vasarab <alexander@wylark.com>
Mon, 29 Jun 2020 18:30:56 +0000 (11:30 -0700)
committerAlexander Vasarab <alexander@wylark.com>
Mon, 29 Jun 2020 18:30:56 +0000 (11:30 -0700)

Trivial merge