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