Fixing up the notification timeout.
Merge branch 'master' into fixes/1.2