Merge pull request #1524 from nicholasbishop/bishop-rewrite-set-timer

Merge pull request #1524 from nicholasbishop/bishop-rewrite-set-timer #3956