e1b32c8 rebase to upstream 1.9

Authored and Committed by sopos 9 years ago
    rebase to upstream 1.9
    
        
file modified
+1 -0
file modified
+5 -4
file modified
+1 -1