Merge branch 'release-0.3'
Merge branch 'master' into develop