Merge commit 'v2.6.38-rc5' into core/locking