Merge branch 'for-4.2/core' into for-4.2/drivers