Merge branch 'inotify'