Merge "x86 needs a bit more stack to handle stack overflows."