466fe3e Sync with f20

Authored and Committed by jvanek 9 years ago
    Sync with f20
    
        
file modified
+43 -5