Merge 3.14-rc4 into staging-next.

We want those fixes here as well.