add/fix notify support, turn on by default
Merge remote-tracking branch 'origin/master'