Merge commit 'v3.3-rc1' into stable/for-linus-fixes-3.3