Merge remote-tracking branch 'upstream/master'

diff --cc Lib/_buildvars.h
Simple merge

diff --cc Output/pjrcUSB/arm/usb_dev.c
Simple merge

diff --cc Output/pjrcUSB/output_com.c
index 36329ac36b63273681e79718215968767961a889,eb25b83ba30e65a5975922c4ca705b248b553dac..140aba67e276fcbb877b5ad93d712de50106713f
--- 1/Output/pjrcUSB/output_com.c
--- 2/Output/pjrcUSB/output_com.c
+++ b/Output/pjrcUSB/output_com.c
@@@ -127,8 -130,13 +130,13 @@@ USBKeyChangeState USBKeys_Changed = USB
  // Indicates whether the Output module is fully functional
  // 0 - Not fully functional, 1 - Fully functional
  // 0 is often used to show that a USB cable is not plugged in (but has power)
 -         uint8_t  Output_Available = 0;
 +      uint8_t  Output_Available = 0;
  
+ // Debug control variable for Output modules
+ // 0 - Debug disabled (default)
+ // 1 - Debug enabled
+          uint8_t  Output_DebugMode = 0;
+ 
  
  
  // ----- Capabilities -----

diff --cc Output/usbMuxUart/output_com.c
index c8c78f556f31aa758094db3ea78866c3701814f7,d33d7e0a64daddb2a5600805de041902f309e128..ae27e255b9ceebe3884e95f097720b3a9b91f526
--- 1/Output/usbMuxUart/output_com.c
--- 2/Output/usbMuxUart/output_com.c
+++ b/Output/usbMuxUart/output_com.c
@@@ -133,8 -133,13 +133,13 @@@ USBKeyChangeState USBKeys_Changed = USB
  // Indicates whether the Output module is fully functional
  // 0 - Not fully functional, 1 - Fully functional
  // 0 is often used to show that a USB cable is not plugged in (but has power)
 -         uint8_t  Output_Available = 0;
 +      uint8_t  Output_Available = 0;
  
+ // Debug control variable for Output modules
+ // 0 - Debug disabled (default)
+ // 1 - Debug enabled
+          uint8_t  Output_DebugMode = 0;
+ 
  
  
  // ----- Capabilities -----

diff --cc README.markdown
Simple merge