8176e05 copy from master

Authored and Committed by mkocka 7 years ago
    copy from master
    
        
file added
+36
file added
+74