diff --git a/LUFA/Doxygen.conf b/LUFA/Doxygen.conf
index 947f49ac3a819d222dc7c0e124c10ac3e14e8efd..eb464ed3c954277f3a8e3814a14d409e885a101d 100644
--- a/LUFA/Doxygen.conf
+++ b/LUFA/Doxygen.conf
@@ -317,7 +317,7 @@ TYPEDEF_HIDES_STRUCT   = YES
 # 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0,
 # corresponding to a cache size of 2^16 = 65536 symbols
 
-SYMBOL_CACHE_SIZE      = 1
+SYMBOL_CACHE_SIZE      = 0
 
 #---------------------------------------------------------------------------
 # Build related configuration options
diff --git a/LUFA/DoxygenPages/FutureChanges.txt b/LUFA/DoxygenPages/FutureChanges.txt
index b51e8856064be95a442d89781bf23dce5a665cff..a8e83b180dfcd3186344e516a83af9b0d5bb618d 100644
--- a/LUFA/DoxygenPages/FutureChanges.txt
+++ b/LUFA/DoxygenPages/FutureChanges.txt
@@ -41,7 +41,7 @@
   *      -# Port all demos to multiple architectures
   *  - Ports
   *      -# Finish USB XMEGA port
-  *      -# Add AVR32 UC3C support
+  *      -# Add AVR32 UC3C, UC3D and UC3L support
   *      -# Atmel ARM7 series microcontrollers
   *      -# Other (commercial) C compilers
   */
diff --git a/LUFA/DoxygenPages/LUFAPoweredProjects.txt b/LUFA/DoxygenPages/LUFAPoweredProjects.txt
index 6a61a91c37cb34ef22ff01c709296a6615e72796..9dbace6e09db329f85d6e87c8e3c1a70de4fa7e9 100644
--- a/LUFA/DoxygenPages/LUFAPoweredProjects.txt
+++ b/LUFA/DoxygenPages/LUFAPoweredProjects.txt
@@ -128,6 +128,7 @@
  *  - MIDIFighter, a USB-MIDI controller: http://www.midifighter.com/
  *  - Norduino, a wireless Arduino: http://norduino.robomotic.com/norduino-is-now-usb-hid/
  *  - Retrode, a USB Games Console Cartridge Reader: http://www.retrode.org
+ *  - RFI21.1EU UHF RFID reader: http://www.metra.cz/rfid/uhf-rfid-ctecky/rfi21-1eu-uhf-rfid-ctecka.htm
  *  - SmartCardDetective, a Smart Card analysis tool: http://www.smartcarddetective.com/
  *  - USBTINY-MKII, an AVRISP-MKII Clone AVR Programmer: http://tom-itx.dyndns.org:81/~webpage/boards/USBTiny_Mkii/USBTiny_Mkii_index.php
  *  - VMeter, a USB MIDI touch strip controller: http://www.vmeter.net/
diff --git a/LUFA/Drivers/USB/Core/Pipe.h b/LUFA/Drivers/USB/Core/Pipe.h
index 387ee5042929d7d419955ea76b525421b3d982bd..fe74c9af9996c647624f021d621751f4a29aa0a7 100644
--- a/LUFA/Drivers/USB/Core/Pipe.h
+++ b/LUFA/Drivers/USB/Core/Pipe.h
@@ -106,7 +106,7 @@
 			/** Pipe number mask, for masking against pipe addresses to retrieve the pipe's numerical address
 			 *  in the device.
 			 */
-			#define PIPE_PIPENUM_MASK               0x07
+			#define PIPE_PIPENUM_MASK               0x0F
 
 			/** Endpoint number mask, for masking against endpoint addresses to retrieve the endpoint's
 			 *  numerical address in the attached device.
@@ -114,7 +114,7 @@
 			#define PIPE_EPNUM_MASK                 0x0F
 
 			/** Endpoint direction mask, for masking against endpoint addresses to retrieve the endpoint's
-			 *  direction for comparing with the \c ENDPOINT_DESCRIPTOR_DIR_* masks.
+			 *  direction for comparing with the \c ENDPOINT_DIR_* masks.
 			 */
 			#define PIPE_EPDIR_MASK                 0x80