Merge commit 'v3.7-rc1' into stable/for-linus-3.7