Merge branch 'release-2.2.0' v2.2.0
authorAlexander Vasarab <alexander@wylark.com>
Sun, 29 Nov 2020 17:32:15 +0000 (09:32 -0800)
committerAlexander Vasarab <alexander@wylark.com>
Sun, 29 Nov 2020 17:32:15 +0000 (09:32 -0800)

Trivial merge