Force trailing slash on all but files
Merge branch 'develop'