Merge commit 'upstream/2.6.1p2'