-Backporting tickless timer fix to R1 from R2
Authored by: m0slevin 2014-10-16
Parent: [r182]
Child: [r184]