Merge branch 'release/0.6.0' into develop
Fix problem of subsequent modules modifying earlier ones.
Bump version number.
Merge branch 'release/0.6.1'