b8fb6c5 Backporting 2.1 fixes

Authored and Committed by fenris02 9 years ago
    Backporting 2.1 fixes
    
        
file added
+32
file added
+29
file added
+45