cleanup
Fix stack size on in-tree regressions.
Merge branch '1.3.x'
Another fix for clang.
Merge branch '1.3.x'
first crack