Include some Acer modifications from 3.1