Merge branch 'atmel'