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