Merge commit 'v2.6.34-rc6' into core/locking