Merge branch 'master' of github.com:arduino/Arduino

Author: cmaglie

boards.txt

@@ -887,12 +887,12 @@ circuitplay32u4cat.bootloader.extended_fuses=0xcb
 circuitplay32u4cat.bootloader.file=caterina/Caterina-Circuitplay32u4.hex
 circuitplay32u4cat.bootloader.unlock_bits=0x3F
 circuitplay32u4cat.bootloader.lock_bits=0x2F
-circuitplay32u4cat.bootloader.tool=arduino:avrdude
+circuitplay32u4cat.bootloader.tool=avrdude
 circuitplay32u4cat.build.mcu=atmega32u4
 circuitplay32u4cat.build.f_cpu=8000000L
 circuitplay32u4cat.build.vid=0x239A
 circuitplay32u4cat.build.pid=0x8011
-circuitplay32u4cat.build.core=arduino:arduino
+circuitplay32u4cat.build.core=arduino
 circuitplay32u4cat.build.variant=circuitplay32u4
 circuitplay32u4cat.build.board=AVR_CIRCUITPLAY
 circuitplay32u4cat.build.usb_product="Circuit Playground"
@@ -904,7 +904,7 @@ circuitplay32u4cat.upload.speed=57600
 circuitplay32u4cat.upload.disable_flushing=true
 circuitplay32u4cat.upload.use_1200bps_touch=true
 circuitplay32u4cat.upload.wait_for_upload_port=true
-circuitplay32u4cat.upload.tool=arduino:avrdude
+circuitplay32u4cat.upload.tool=avrdude
 circuitplay32u4cat.vid.0=0x239A
 circuitplay32u4cat.pid.0=0x8011