Merge branch 'i8k-updates' from Alan