am 519751a8: Merge "There\'s no such thing as _THREAD_SAFE."

* commit '519751a88217e6fdc3b86979ffaf61ff03d92312':
  There's no such thing as _THREAD_SAFE.