Merge branch 'fixes' into next
authorUlf Hansson <ulf.hansson@linaro.org>
Mon, 1 Feb 2021 11:03:14 +0000 (12:03 +0100)
committerUlf Hansson <ulf.hansson@linaro.org>
Mon, 1 Feb 2021 11:03:14 +0000 (12:03 +0100)

Trivial merge