Merge branch 'v0.5.0'