[AutoTimer] Sync some changes from plugin master
Merge pull request #32 from jbleyel/2.3

[AutoTimer] Sync some changes from plugin master