Handle empty timer display
Merge branch 'master' into builds
7.715