Better support for different types of Notification
Merge pull request #1230 from ebautistabar/poly_notifications

Better support for different types of Notification