-Backporting timer condition fix from R2 branch
Authored by: m0slevin 2014-10-16
Parent: [r181]
Child: [r183]