Merge branch 'release/0.3.0' into develop