Merge remote-tracking branch 'armsoc/at91/9x5' into at91-3.4-base2