Merge branch 'master' of github.com:adafruit/ArduinoCore-samd

Author: deanm1278

cores/arduino/USB/USBCore.h

@@ -101,7 +101,7 @@
 // bMaxPower in Configuration Descriptor
 #define USB_CONFIG_POWER_MA(mA)                ((mA)/2)
 #ifndef USB_CONFIG_POWER
- #define USB_CONFIG_POWER                      (500)
+ #define USB_CONFIG_POWER                      (100)
 #endif
 
 #define CDC_V1_10                               0x0110

platform.txt

@@ -20,7 +20,7 @@
 # https://github.com/arduino/Arduino/wiki/Arduino-IDE-1.5---3rd-party-Hardware-specification
 
 name=Adafruit SAMD (32-bits ARM Cortex-M0+ and Cortex-M4) Boards
-version=1.2.4
+version=1.2.5
 
 # Compile variables
 # -----------------