Merge commit 'upstream/1.8.1p2'