ugh, extending timeouts makes this pass
Merge branch '1.12'