Merge branch 'fixes' into next

This commit is contained in:
Ulf Hansson 2017-12-18 13:57:04 +01:00
commit da3588b66e