Merge branch 'fixes' into next

This commit is contained in:
Ulf Hansson 2017-11-02 15:20:33 +01:00
commit eaaffcefaa