Merge branch 'fix/avr_context'
authorPaul Brossier <piem@piem.org>
Mon, 6 Aug 2018 15:46:22 +0000 (17:46 +0200)
committerPaul Brossier <piem@piem.org>
Mon, 6 Aug 2018 15:46:22 +0000 (17:46 +0200)

Trivial merge