Merge branch 'fixes-rc2' into fixes
authorTony Lindgren <tony@atomide.com>
Mon, 8 Mar 2021 09:34:12 +0000 (11:34 +0200)
committerTony Lindgren <tony@atomide.com>
Mon, 8 Mar 2021 09:34:12 +0000 (11:34 +0200)

Trivial merge