Thanks! Fixes regressions in 2.13.6 (and earlier, I think even in 2.12.x).
amd64 done
ppc64 done
ppc done
x86 done