* NEW: Change notifier
* FIX: CR
Merge branch 'master' into debug