Please back port r203007 to the 3.4.1 release. -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.