Notification timeouts #502
Merge remote branch 'KiwiIRC/development' into development