Merge branch 'samd21' of ssh://git.gag.com/scm/git/fw/altos into samd21