Merge branch 'zero' of github.com:arduino/ArduinoZero into zero

Author: jnthbdn

platform.txt

@@ -78,7 +78,7 @@ tools.openocd.path={runtime.ide.path}/hardware/tools/openocd-0.8.0
 tools.openocd.upload.params.verbose=
 tools.openocd.upload.params.quiet=
 #tools.openocd.upload.pattern="{path}/{cmd}" {upload.verbose} -s "{path}/share/openocd/scripts/" -f board/atmel_samd21_xplained_pro.cfg -c "program {build.path}/{build.project_name}.elf verify reset"
-tools.openocd.upload.pattern="{path}/{cmd}" {upload.verbose} -s "{path}/share/openocd/scripts/" -f {build.variant.path}/{build.variant}/{build.openocdscript} -c "program {build.path}/{build.project_name}.elf verify reset"
+tools.openocd.upload.pattern="{path}/{cmd}" {upload.verbose} -s "{path}/share/openocd/scripts/" -f ../../../../../arduino/samd/variants/{build.variant}/{build.openocdscript} -c "program {build.path}/{build.project_name}.elf verify reset"
 #tools.openocd.upload.pattern.windows="{path}/{cmd}" {upload.verbose} -s "{path}/scripts/" -f board/atmel_samd21_xplained_pro.cfg -c "program {build.path}/{build.project_name}.elf verify reset"
 tools.openocd.upload.pattern.windows="{path}/{cmd}" -s "{path}/scripts/" -f "../../../arduino/samd/variants/{build.variant}/{build.openocdscript}" -c "program {build.path}/{build.project_name}.elf verify reset"