Updates for release 0.6.2-beta.
Merge branch 'release-0.6.2-beta' into develop