Merge pull request #1867 from saper/ucontext_x86