Merge branch 'release/0.5.0'
Merge branch 'release/0.5.1'
Bump the version correctly
Merge branch 'master' into develop