Merge branch 'for-4.13-fixes' into for-4.14