Merge branch 'master' into zero

Conflicts:
	hardware/arduino/sam/platform.txt

Author: cmaglie

platform.txt

@@ -3,8 +3,8 @@
 # For more info:
 # https://github.com/arduino/Arduino/wiki/Arduino-IDE-1.5---3rd-party-Hardware-specification
 
-name=Arduino ARM Cortex-M0+ (32-bits) Boards
-version=1.6.0
+name=Arduino SAMD (32-bits ARM Cortex-M0+) Boards
+version=1.6.1
 
 # Compile variables
 # ----------------------