Reid master

Patch to reid's fix for throttling toast messages