Merge commit 'v2.6.27' into timers/hpet