Merge branch 'cpuidle' into release