scope - better message window on right support, apply some prefs asap
Ignores waf3's dirs.
Merge remote-tracking branch 'upstream/master'