Merge branch 'fixes' into next

This commit is contained in:
Ulf Hansson 2020-10-09 08:58:30 +02:00
commit 937fb531d3