Add 'inotify' task to 'fix' role
Merge remote-tracking branch 'upstream/master'