Merge branch 'single-arduino'