Merge "Fix for mysterious x86 division crash." into idea133