Use filesystem as alternative to default, not Mongo
Merge branch 'v0.5'