Merge branch 'e1000'