Merge branch 'release/0.4.2' into develop
Bump version
Update docs
Update docs from develop
Revert version.