Error notifications
Merge branch 'master' into error-display