08645c7 Rebase to upstream 1.5.

Authored and Committed by Jan Kratochvil 8 years ago
    Rebase to upstream 1.5.
    
        
file modified
+1 -1
file modified
+5 -3
file modified
+1 -1