Merge branch 'release-0.10'