f52793b merge changes from master

Authored and Committed by mhlavink 5 years ago
    merge changes from master
    
        
file modified
+1 -1
file modified
+41 -39