timer bug fix
Merge commit 'bc0c01618914c00a200e6c89f796d291bc5ea972' into bugfix
Merge branch 'bugfix'