0f79065 syncing with future usptream 1.6.2

Authored and Committed by jvanek 8 years ago
    syncing with future usptream 1.6.2
    
        
file modified
+11 -1