Merge commit 'v2.6.30-rc5' into next