Merge branch 'avr-firmware'
authorJoseph Coffland <joseph@cauldrondevelopment.com>
Sat, 14 Jan 2017 01:52:04 +0000 (17:52 -0800)
committerJoseph Coffland <joseph@cauldrondevelopment.com>
Sat, 14 Jan 2017 01:52:04 +0000 (17:52 -0800)

Trivial merge