Merge commit 'upstream/1.7.2p6'