Merge branch 'timers/core' into sched/hrtimers