Merge "Forward-compatible fix for ucontext_t"