Merge branch 'release/2.0.4' into develop
Stray whitespace.
Make folders work without trailing slash
2.0.5
Merge branch 'master' of github.com:ff0000/statix