5b827c Merge branch 'stop-segfault'

Merged and Committed by Jared K. Smith 2 years ago
    Merge branch 'stop-segfault'
    
        
file modified
+6 -2