881203c Backport PR #887 to fix a crasher (#1795004)

Authored and Committed by adamwill 4 years ago
    Backport PR #887 to fix a crasher (#1795004)
    
        
file added
+59
file modified
+8 -1