Merge branch 'for-4.11/fixes' into for-next