am a186456f: Safely handle interrupts during Thread.join()

* commit 'a186456ff58a6091603956b6788565a273a29485':
  Safely handle interrupts during Thread.join()