diff --git a/.codespellrc b/.codespellrc
index d5d337d2c..825e4a0a2 100644
--- a/.codespellrc
+++ b/.codespellrc
@@ -1,7 +1,7 @@
 # See: https://github.com/codespell-project/codespell#using-a-config-file
 [codespell]
 # In the event of a false positive, add the problematic word, in all lowercase, to a comma-separated list here:
-ignore-words-list = hart,pullrequest
+ignore-words-list = clen,hart,pullrequest
 builtin = clear
 check-filenames =
 check-hidden =
diff --git a/boards.txt b/boards.txt
index ab18bae0e..b9add104a 100644
--- a/boards.txt
+++ b/boards.txt
@@ -58,7 +58,7 @@ yun.build.extra_flags={build.usb_flags}
 
 ##############################################################
 
-uno.name=Arduino Uno
+uno.name=Arduino UNO
 
 uno.vid.0=0x2341
 uno.pid.0=0x0043
@@ -68,6 +68,8 @@ uno.vid.2=0x2A03
 uno.pid.2=0x0043
 uno.vid.3=0x2341
 uno.pid.3=0x0243
+uno.vid.4=0x2341
+uno.pid.4=0x006A
 uno.upload_port.0.vid=0x2341
 uno.upload_port.0.pid=0x0043
 uno.upload_port.1.vid=0x2341
@@ -76,7 +78,9 @@ uno.upload_port.2.vid=0x2A03
 uno.upload_port.2.pid=0x0043
 uno.upload_port.3.vid=0x2341
 uno.upload_port.3.pid=0x0243
-uno.upload_port.4.board=uno
+uno.upload_port.4.vid=0x2341
+uno.upload_port.4.pid=0x006A
+uno.upload_port.5.board=uno
 
 uno.upload.tool=avrdude
 uno.upload.tool.default=avrdude
@@ -103,7 +107,7 @@ uno.build.variant=standard
 
 ##############################################################
 
-unomini.name=Arduino Uno Mini
+unomini.name=Arduino UNO Mini
 
 unomini.vid.0=0x2341
 unomini.pid.0=0x0062
@@ -1268,7 +1272,7 @@ one.build.extra_flags={build.usb_flags}
 
 ##############################################################
 
-unowifi.name=Arduino Uno WiFi
+unowifi.name=Arduino UNO WiFi
 unowifi.vid.0=0x2A03
 unowifi.pid.0=0x0057
 unowifi.upload_port.0.vid=0x2A03
diff --git a/bootloaders/atmega/ATmegaBOOT_168.c b/bootloaders/atmega/ATmegaBOOT_168.c
index ff2c4e486..143e7a7ca 100644
--- a/bootloaders/atmega/ATmegaBOOT_168.c
+++ b/bootloaders/atmega/ATmegaBOOT_168.c
@@ -387,7 +387,7 @@ int main(void)
 	UCSR0C = (1<<UCSZ00) | (1<<UCSZ01);
 
 	/* Enable internal pull-up resistor on pin D0 (RX), in order
-	to supress line noise that prevents the bootloader from
+	to suppress line noise that prevents the bootloader from
 	timing out (DAM: 20070509) */
 	DDRD &= ~_BV(PIND0);
 	PORTD |= _BV(PIND0);
@@ -408,7 +408,7 @@ int main(void)
 
 #if defined __AVR_ATmega1280__
 	/* Enable internal pull-up resistor on pin D0 (RX), in order
-	to supress line noise that prevents the bootloader from
+	to suppress line noise that prevents the bootloader from
 	timing out (DAM: 20070509) */
 	/* feature added to the Arduino Mega --DC: 080930 */
 	DDRE &= ~_BV(PINE0);
@@ -447,7 +447,7 @@ int main(void)
 
 
 	/* Request programmer ID */
-	/* Not using PROGMEM string due to boot block in m128 being beyond 64kB boundry  */
+	/* Not using PROGMEM string due to boot block in m128 being beyond 64kB boundary  */
 	/* Would need to selectively manipulate RAMPZ, and it's only 9 characters anyway so who cares.  */
 	else if(ch=='1') {
 		if (getch() == ' ') {
@@ -730,7 +730,7 @@ int main(void)
 					if (!flags.rampz) putch(pgm_read_byte_near(address.word));
 #if defined(__AVR_ATmega128__) || defined(__AVR_ATmega1280__)
 					else putch(pgm_read_byte_far(address.word + 0x10000));
-					// Hmmmm, yuck  FIXME when m256 arrvies
+					// Hmmmm, yuck  FIXME when m256 arrives
 #endif
 					address.word++;
 				}
diff --git a/bootloaders/atmega8/ATmegaBOOT.c b/bootloaders/atmega8/ATmegaBOOT.c
index 8c8d22a96..99857b62f 100644
--- a/bootloaders/atmega8/ATmegaBOOT.c
+++ b/bootloaders/atmega8/ATmegaBOOT.c
@@ -199,7 +199,7 @@ int main(void)
 		}
 	
 		/* Request programmer ID */
-		/* Not using PROGMEM string due to boot block in m128 being beyond 64kB boundry  */
+		/* Not using PROGMEM string due to boot block in m128 being beyond 64kB boundary  */
 		/* Would need to selectively manipulate RAMPZ, and it's only 9 characters anyway so who cares.  */
 		else if(ch=='1') {
 			if (getch() == ' ') {
@@ -248,7 +248,7 @@ int main(void)
 		else if(ch=='P') {
 		  nothing_response();
 		  // FIXME: modified only here by DojoCorp, Mumbai, India, 20050626
-		  //time_count=0; // exted the delay once entered prog.mode
+		  //time_count=0; // extend the delay once entered prog.mode
 		}
 	
 		/* Leave programming mode  */
diff --git a/bootloaders/bt/ATmegaBOOT_168.c b/bootloaders/bt/ATmegaBOOT_168.c
index d477e7a68..62249106a 100644
--- a/bootloaders/bt/ATmegaBOOT_168.c
+++ b/bootloaders/bt/ATmegaBOOT_168.c
@@ -465,7 +465,7 @@ putch(0x0D);
 
 
 	/* Request programmer ID */
-	/* Not using PROGMEM string due to boot block in m128 being beyond 64kB boundry  */
+	/* Not using PROGMEM string due to boot block in m128 being beyond 64kB boundary  */
 	/* Would need to selectively manipulate RAMPZ, and it's only 9 characters anyway so who cares.  */
 	else if(ch=='1') {
 	    if (getch() == ' ') {
@@ -727,7 +727,7 @@ putch(0x0D);
 			if (!flags.rampz) putch(pgm_read_byte_near(address.word));
 #if defined __AVR_ATmega128__
 			else putch(pgm_read_byte_far(address.word + 0x10000));
-			// Hmmmm, yuck  FIXME when m256 arrvies
+			// Hmmmm, yuck  FIXME when m256 arrives
 #endif
 			address.word++;
 		    }
diff --git a/bootloaders/caterina-Arduino_Robot/Makefile b/bootloaders/caterina-Arduino_Robot/Makefile
index af9990e96..315671d14 100644
--- a/bootloaders/caterina-Arduino_Robot/Makefile
+++ b/bootloaders/caterina-Arduino_Robot/Makefile
@@ -191,7 +191,7 @@ DEBUG = dwarf-2
 
 
 # List any extra directories to look for include files here.
-#     Each directory must be seperated by a space.
+#     Each directory must be separated by a space.
 #     Use forward slashes for directory separators.
 #     For a directory that has spaces, enclose it in quotes.
 EXTRAINCDIRS = $(LUFA_PATH)/
@@ -331,7 +331,7 @@ MATH_LIB = -lm
 
 
 # List any extra directories to look for libraries here.
-#     Each directory must be seperated by a space.
+#     Each directory must be separated by a space.
 #     Use forward slashes for directory separators.
 #     For a directory that has spaces, enclose it in quotes.
 EXTRALIBDIRS =
diff --git a/bootloaders/caterina-LilyPadUSB/Makefile b/bootloaders/caterina-LilyPadUSB/Makefile
index 8443e14bc..18a4455a5 100644
--- a/bootloaders/caterina-LilyPadUSB/Makefile
+++ b/bootloaders/caterina-LilyPadUSB/Makefile
@@ -180,7 +180,7 @@ DEBUG = dwarf-2
 
 
 # List any extra directories to look for include files here.
-#     Each directory must be seperated by a space.
+#     Each directory must be separated by a space.
 #     Use forward slashes for directory separators.
 #     For a directory that has spaces, enclose it in quotes.
 EXTRAINCDIRS = $(LUFA_PATH)/
@@ -320,7 +320,7 @@ MATH_LIB = -lm
 
 
 # List any extra directories to look for libraries here.
-#     Each directory must be seperated by a space.
+#     Each directory must be separated by a space.
 #     Use forward slashes for directory separators.
 #     For a directory that has spaces, enclose it in quotes.
 EXTRALIBDIRS =
diff --git a/bootloaders/caterina/Makefile b/bootloaders/caterina/Makefile
index b3bd9e8d3..a0536083d 100644
--- a/bootloaders/caterina/Makefile
+++ b/bootloaders/caterina/Makefile
@@ -187,7 +187,7 @@ DEBUG = dwarf-2
 
 
 # List any extra directories to look for include files here.
-#     Each directory must be seperated by a space.
+#     Each directory must be separated by a space.
 #     Use forward slashes for directory separators.
 #     For a directory that has spaces, enclose it in quotes.
 EXTRAINCDIRS = $(LUFA_PATH)/
@@ -327,7 +327,7 @@ MATH_LIB = -lm
 
 
 # List any extra directories to look for libraries here.
-#     Each directory must be seperated by a space.
+#     Each directory must be separated by a space.
 #     Use forward slashes for directory separators.
 #     For a directory that has spaces, enclose it in quotes.
 EXTRALIBDIRS =
diff --git a/bootloaders/gemma/avrdude.conf b/bootloaders/gemma/avrdude.conf
index 2e1aebbce..a1ef73ca9 100644
--- a/bootloaders/gemma/avrdude.conf
+++ b/bootloaders/gemma/avrdude.conf
@@ -170,7 +170,7 @@
 #
 # INSTRUCTION FORMATS
 #
-#    Instruction formats are specified as a comma seperated list of
+#    Instruction formats are specified as a comma separated list of
 #    string values containing information (bit specifiers) about each
 #    of the 32 bits of the instruction.  Bit specifiers may be one of
 #    the following formats:
@@ -365,7 +365,7 @@ programmer
 # http://flashrom.org/FT2232SPI_Programmer
 # 
 # The drivers will look for a specific device and use the first one found.
-# If you have mulitple devices, then look for unique information (like SN)
+# If you have multiple devices, then look for unique information (like SN)
 # And fill that in here.
 #
 # Note that the pin numbers for the main ISP signals (reset, sck,
diff --git a/bootloaders/lilypad/src/ATmegaBOOT.c b/bootloaders/lilypad/src/ATmegaBOOT.c
index 415babee7..37a587ac9 100644
--- a/bootloaders/lilypad/src/ATmegaBOOT.c
+++ b/bootloaders/lilypad/src/ATmegaBOOT.c
@@ -330,7 +330,7 @@ int main(void)
     UCSR0C = (1<<UCSZ00) | (1<<UCSZ01);
 
     /* Enable internal pull-up resistor on pin D0 (RX), in order
-    to supress line noise that prevents the bootloader from
+    to suppress line noise that prevents the bootloader from
     timing out (DAM: 20070509) */
     DDRD &= ~_BV(PIND0);
     PORTD |= _BV(PIND0);
@@ -381,7 +381,7 @@ int main(void)
 
 
 	/* Request programmer ID */
-	/* Not using PROGMEM string due to boot block in m128 being beyond 64kB boundry  */
+	/* Not using PROGMEM string due to boot block in m128 being beyond 64kB boundary  */
 	/* Would need to selectively manipulate RAMPZ, and it's only 9 characters anyway so who cares.  */
 	else if(ch=='1') {
 	    if (getch() == ' ') {
@@ -649,7 +649,7 @@ int main(void)
 			if (!flags.rampz) putch(pgm_read_byte_near(address.word));
 #if defined __AVR_ATmega128__
 			else putch(pgm_read_byte_far(address.word + 0x10000));
-			// Hmmmm, yuck  FIXME when m256 arrvies
+			// Hmmmm, yuck  FIXME when m256 arrives
 #endif
 			address.word++;
 		    }
diff --git a/bootloaders/stk500v2/Makefile b/bootloaders/stk500v2/Makefile
index eeb9add03..d8ce3a520 100644
--- a/bootloaders/stk500v2/Makefile
+++ b/bootloaders/stk500v2/Makefile
@@ -90,7 +90,7 @@ DEBUG = dwarf-2
 
 
 # List any extra directories to look for include files here.
-#     Each directory must be seperated by a space.
+#     Each directory must be separated by a space.
 #     Use forward slashes for directory separators.
 #     For a directory that has spaces, enclose it in quotes.
 EXTRAINCDIRS = 
diff --git a/cores/arduino/CDC.cpp b/cores/arduino/CDC.cpp
index 7d5afaabe..4fe3bf5e5 100644
--- a/cores/arduino/CDC.cpp
+++ b/cores/arduino/CDC.cpp
@@ -119,7 +119,7 @@ bool CDC_Setup(USBSetup& setup)
 			// For future boards save the key in the inproblematic RAMEND
 			// Which is reserved for the main() return value (which will never return)
 			if (isLUFAbootloader()) {
-				// horray, we got a new bootloader!
+				// hooray, we got a new bootloader!
 				magic_key_pos = (RAMEND-1);
 			}
 #endif
diff --git a/cores/arduino/USBCore.h b/cores/arduino/USBCore.h
index 0c63c2b1f..8642382f1 100644
--- a/cores/arduino/USBCore.h
+++ b/cores/arduino/USBCore.h
@@ -191,7 +191,7 @@ typedef struct
 } EndpointDescriptor;
 
 // Interface Association Descriptor
-// Used to bind 2 interfaces together in CDC compostite device
+// Used to bind 2 interfaces together in CDC composite device
 typedef struct
 {
 	u8 len;				// 8
diff --git a/drivers/arduino.cat b/drivers/arduino.cat
index 2b20fe60d..bd7fe2b80 100644
Binary files a/drivers/arduino.cat and b/drivers/arduino.cat differ
diff --git a/drivers/arduino.inf b/drivers/arduino.inf
index ac0251bef..c0284efcf 100644
--- a/drivers/arduino.inf
+++ b/drivers/arduino.inf
@@ -55,6 +55,7 @@ robotMotor.sketch.name="Arduino Robot"
 uno.name="Arduino Uno"
 unoR3.name="Arduino Uno"
 unomini.name="Arduino Uno Mini"
+makeyourunokit.name="Arduino Make Your Uno Kit"
 usbserial.name="Arduino USB Serial Light Adapter"
 yun.bootloader.name="Arduino Yun bootloader"
 yun.sketch.name="Arduino Yun"
@@ -108,6 +109,7 @@ DefaultDestDir=12
 %uno.name%=DriverInstall, USB\VID_2341&PID_0001
 %unoR3.name%=DriverInstall, USB\VID_2341&PID_0043
 %unomini.name%=DriverInstall, USB\VID_2341&PID_0062
+%makeyourunokit.name%=DriverInstall, USB\VID_2341&PID_006A
 %usbserial.name%=DriverInstall, USB\VID_2341&PID_003B
 %yun.bootloader.name%=DriverInstall, USB\VID_2341&PID_0041
 %yun.sketch.name%=DriverInstall, USB\VID_2341&PID_8041&MI_00
@@ -138,6 +140,7 @@ DefaultDestDir=12
 %uno.name%=DriverInstall, USB\VID_2341&PID_0001
 %unoR3.name%=DriverInstall, USB\VID_2341&PID_0043
 %unomini.name%=DriverInstall, USB\VID_2341&PID_0062
+%makeyourunokit.name%=DriverInstall, USB\VID_2341&PID_006A
 %usbserial.name%=DriverInstall, USB\VID_2341&PID_003B
 %robotControl.bootloader.name%=DriverInstall, USB\VID_2341&PID_0038
 %robotControl.sketch.name%=DriverInstall, USB\VID_2341&PID_8038&MI_00
@@ -172,6 +175,7 @@ DefaultDestDir=12
 %uno.name%=DriverInstall, USB\VID_2341&PID_0001
 %unoR3.name%=DriverInstall, USB\VID_2341&PID_0043
 %unomini.name%=DriverInstall, USB\VID_2341&PID_0062
+%makeyourunokit.name%=DriverInstall, USB\VID_2341&PID_006A
 %usbserial.name%=DriverInstall, USB\VID_2341&PID_003B
 %robotControl.bootloader.name%=DriverInstall, USB\VID_2341&PID_0038
 %robotControl.sketch.name%=DriverInstall, USB\VID_2341&PID_8038&MI_00
diff --git a/firmwares/atmegaxxu2/arduino-usbdfu/makefile b/firmwares/atmegaxxu2/arduino-usbdfu/makefile
index 1fb4ed346..96e50162c 100644
--- a/firmwares/atmegaxxu2/arduino-usbdfu/makefile
+++ b/firmwares/atmegaxxu2/arduino-usbdfu/makefile
@@ -171,7 +171,7 @@ DEBUG = dwarf-2
 
 
 # List any extra directories to look for include files here.
-#     Each directory must be seperated by a space.
+#     Each directory must be separated by a space.
 #     Use forward slashes for directory separators.
 #     For a directory that has spaces, enclose it in quotes.
 EXTRAINCDIRS = $(LUFA_PATH)/
@@ -310,7 +310,7 @@ MATH_LIB = -lm
 
 
 # List any extra directories to look for libraries here.
-#     Each directory must be seperated by a space.
+#     Each directory must be separated by a space.
 #     Use forward slashes for directory separators.
 #     For a directory that has spaces, enclose it in quotes.
 EXTRALIBDIRS = 
diff --git a/firmwares/atmegaxxu2/arduino-usbserial/makefile b/firmwares/atmegaxxu2/arduino-usbserial/makefile
index 79d6be231..6ce645ab4 100644
--- a/firmwares/atmegaxxu2/arduino-usbserial/makefile
+++ b/firmwares/atmegaxxu2/arduino-usbserial/makefile
@@ -188,7 +188,7 @@ DEBUG = dwarf-2
 
 
 # List any extra directories to look for include files here.
-#     Each directory must be seperated by a space.
+#     Each directory must be separated by a space.
 #     Use forward slashes for directory separators.
 #     For a directory that has spaces, enclose it in quotes.
 EXTRAINCDIRS = $(LUFA_PATH)/
@@ -328,7 +328,7 @@ MATH_LIB = -lm
 
 
 # List any extra directories to look for libraries here.
-#     Each directory must be seperated by a space.
+#     Each directory must be separated by a space.
 #     Use forward slashes for directory separators.
 #     For a directory that has spaces, enclose it in quotes.
 EXTRALIBDIRS = 
diff --git a/libraries/Wire/examples/i2c_scanner/i2c_scanner.ino b/libraries/Wire/examples/i2c_scanner/i2c_scanner.ino
index 295edf7ef..508de805d 100644
--- a/libraries/Wire/examples/i2c_scanner/i2c_scanner.ino
+++ b/libraries/Wire/examples/i2c_scanner/i2c_scanner.ino
@@ -6,7 +6,7 @@
 //    can be found in many places.
 //    For example on the Arduino.cc forum.
 //    The original author is not known.
-// Version 2, Juni 2012, Using Arduino 1.0.1
+// Version 2, June 2012, Using Arduino 1.0.1
 //     Adapted to be as simple as possible by Arduino.cc user Krodal
 // Version 3, Feb 26  2013
 //    V3 by louarnold
diff --git a/platform.txt b/platform.txt
index 617185ce0..df5ddb712 100644
--- a/platform.txt
+++ b/platform.txt
@@ -6,7 +6,7 @@
 # https://arduino.github.io/arduino-cli/latest/platform-specification/
 
 name=Arduino AVR Boards
-version=1.8.5
+version=1.8.6
 
 # AVR compile variables
 # ---------------------
diff --git a/post_install.bat b/post_install.bat
index 10db2234e..fcc8d8c78 100644
--- a/post_install.bat
+++ b/post_install.bat
@@ -10,11 +10,11 @@ if "%PROCESSOR_ARCHITECTURE%" == "AMD64" (
 
 REM dpinst /PATH has problems with relative paths, so use absolute path.
 if "%PROCESSOR_ARCHITECTURE%" == "AMD64" (
-  drivers\dpinst-amd64.exe /PATH %cd%\drivers\gemma %ARGS%
+  drivers\dpinst-amd64.exe /PATH "%cd%\drivers\gemma" %ARGS%
 ) ELSE IF "%PROCESSOR_ARCHITEW6432%" == "AMD64" (
-  drivers\dpinst-amd64.exe /PATH %cd%\drivers\gemma %ARGS%
+  drivers\dpinst-amd64.exe /PATH "%cd%\drivers\gemma" %ARGS%
 ) ELSE (
-  drivers\dpinst-x86.exe /PATH %cd%\drivers\gemma %ARGS%
+  drivers\dpinst-x86.exe /PATH "%cd%\drivers\gemma" %ARGS%
 )
 
 exit /b 0