Merge commit 'upstream/0.6'