Update history
Bump version number
Merge branch 'release/0.6' into develop