Bump version number.
Update history.
Merge branch 'prep-0.7' into develop