fixes FolderWatcher bug.
Merge origin/master