Merge branch 'for-4.2' into for-next