CIFS info store first cut
Merge remote-tracking branch 'origin/master'