am 6c83305c: Merge "Rethrow SIGTRAP too."

* commit '6c83305c9a0c43eff407f3b4a2ff10ad0be26f01':
  Rethrow SIGTRAP too.