Use subnotify if available
Merge branch 'master' into ST3