Merge remote-tracking branch 'upstream/master' into enum_dirperms_default_path

Conflicts:
	modules/post/windows/gather/enum_dirperms.rb

Author: sinn3r

modules/post/windows/gather/enum_dirperms.rb

@@ -111,7 +111,7 @@ def enum_subdirs(perm_filter, dpath, maxdepth, token)
 				realpath = dpath + '\\' + d
 				if session.fs.file.stat(realpath).directory?
 					perm = check_dir(realpath, token)
-					if perm_filter and perm.include?(perm_filter)
+					if perm_filter and perm and perm.include?(perm_filter)
 						print_status(perm + "\t" + realpath)
 					end
 					enum_subdirs(perm_filter, realpath, maxdepth - 1,token)