Merge branch 'for-4.1/core-noarch' into for-linus