Merge branch 'fixes' into next

This commit is contained in:
Ulf Hansson 2020-11-17 12:48:34 +01:00
commit 506f43994d
2 changed files with 30 additions and 34 deletions