Better way to control menu timers.
Merge remote-tracking branch 'origin/master'