Fold in changes.
Merge branch 'release-0.3.2' into develop