Merge branch 'fixes' into next

This commit is contained in:
Ulf Hansson 2018-03-05 13:04:37 +01:00
commit 611d059f1a