Fixed last run display error
Resync with Dan's branch
Merge branch 'master' of https://github.com/jonathan-marsh/OSPi