Merge branch 'master' of github.com:gorakhargosh/watchdog

Conflicts:
	src/watchdog/events.py
	src/watchdog/observers/inotify.py
	src/watchdog/utils/dirsnapshot.py