Merge branch 'hotfix/style'
Fix trailing slash in documentation
Merge branch 'master' into develop