Merge commit 'upstream/1.7.6p1'