Update documentation
Merge branch 'release/0.10.4' into develop