04f7821 Merge branch 'master' into f29

Merged and Committed by kalev 5 years ago
    Merge branch 'master' into f29
    
        
file modified
+129 -42