Merge fsnotify changes with fixed up authorship.