Merge 3.0-rc2 into tty-linus