Merge branch 'fixes' into next

This commit is contained in:
Ulf Hansson 2020-09-07 09:17:07 +02:00
commit 5de1a3e322
6 changed files with 123 additions and 63 deletions