No more untimely deaths
Merge branch 'master' into dashboard
Added the dashboard