Apply ivanhoe's spell check crash fix from /r/1951 to default

18 months ago, Gary Kramlich