Merge branch 'MDL-70046-master-notificationfailure' of https://github.com/drjosephbax...