Merge branch 'fixes' into next

This commit is contained in:
Ulf Hansson 2019-12-19 08:15:58 +01:00
commit 9f606f11ea