Merge commit 'upstream/0.15'