Merge remote-tracking branch 'upstream/xmega_support_test'
Revert "Merge remote-tracking branch 'upstream/xmega_support_test'"

This reverts commit 72febf8b622ac7605bd09aafaed73cd7c34cf07f.