Merge branch 'release-0.15'