Merge branch 'mpc8610'