Merge 3.13-rc4 into char-misc-next

We want these fixes in here.