Indent
Fix warnings
Merge branch 'master' into smbfs