Additional parent test
Merge branch 'master' of github.com:Zillode/syncthing-inotify

Conflicts:
	syncwatcher_test.go