02c912a merge changes

Merged and Committed by stransky 5 years ago
    merge changes
    
        
file modified
+5 -2