Merge branch 'master' into develop
feature no-remote
Version bump to 0.6
bump commit
build commit
Merge branch 'release-0.6'