Merge pull request #3569 from lambdageek/monodis-no-segfault