Add doubling stack extend, as fix for #2016

`make test` for Windows7 on Virtualbox now takes less than 2sec.