Merge commit 'upstream/0.3.1'