more work on segment notifications
Merge remote branch 'origin/springCleaning' into springCleaning
more work on segment notification