Merge commit 'upstream/3.1.0'