Merge branch 'master' into v0.9