Merge remote-tracking branch 'mpc83xx/next'