Merge branch 'at91' into devel