Merge remote-tracking branch 'fscache/fscache'