Merge 3.14-rc5 into char-misc-next

We want these fixes in here as well.