Merge commit 'linus/master' into bkl/core