Timer bug fix for 0.3.x
Added issue number to change log.
Merge pull request #1905 from pllim/timer-fix-six

Timer bug fix for 0.3.x