Merge 3.13-rc4 into tty-next

We want the fixes in here as well.