fixes FolderWatcher bug that was created in previous bug fix.
Merge origin/master