Merge branch 'efiemu' into phcoder