Merge pull request #1213 from fengari/system_timers_timer_opt