Merge branch 'cpuidle' into test