Merge branch 'timers/hpet' into timers/core