Merge branch 'fixes' into next

This commit is contained in:
Ulf Hansson 2020-12-04 12:34:19 +01:00
commit 46ed081078