Merge commit 'upstream/1.1'