576ff65 Include upstream commits to fix login traceback (#1190230)

Authored and Committed by swt2c 9 years ago
    Include upstream commits to fix login traceback (#1190230)
    
        
file modified
+7 -1
file added
+90