Merge branch 'fixes' into for-next

Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk>