Merge tag 'v3.7' into stable/for-linus-3.8