Merge pull request #5 from pydio/develop

after 6.0.1