put the wrong README back in...
Merge branch 'master' into fs-detection