Fix #404
Merge branch 'master' of https://github.com/pydio/pydio-core