84de1a7 Merge branch 'master' into f29

Merged and Committed by adamwill 5 years ago
    Merge branch 'master' into f29
    
    Brings in fixes from master branch.
    
        
file modified
+18 -1