typo
Merge branch 'master' into v0.5-rc