Merge branch 'develop'
Update documentation
Merge branch 'hotfix/404-update' into develop
Merge branch 'develop' into gh-pages