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