Merge branch 'develop'
Sets version to 0.6.0-dev.