Merge branch 'fixes' into next

This commit is contained in:
Ulf Hansson 2019-06-10 17:12:20 +02:00
commit 07649d9550