Merge 3.18-rc7 into tty-next