Merge pull request #2233 from madewokherd/ucontextgregs