am 6e37ebfe: am 6c83305c: Merge "Rethrow SIGTRAP too."

* commit '6e37ebfe5cb037bba00967d4b3e891c122ec4904':
  Rethrow SIGTRAP too.