Merge tag 'at91-fixes' into at91-4.1-multiplatform