Merge-in fix for segfault from current github repository.