Merge pull request #854 from AudriusButkevicius/nils

Revert and replace 31d95ac, 65acc7c, 87780a5

internal/model/model.go

@@ -1017,7 +1017,7 @@ func (m *Model) ScanFolderSub(folder, sub string) error {
 	w := &scanner.Walker{
 		Dir:          dir,
 		Sub:          sub,
-		Ignores:      ignores,
+		Matcher:      ignores,
 		BlockSize:    protocol.BlockSize,
 		TempNamer:    defTempNamer,
 		CurrentFiler: cFiler{m, folder},