Merge branch 'x86-traps' (trap handling from Andy Lutomirski)