am 2e9ca540: am 12bb2c4c: am fe7c2a50: Merge change I996db8da into eclair

Merge commit '2e9ca540fc15da4363111860949136e61b816dac'

* commit '2e9ca540fc15da4363111860949136e61b816dac':
  Fix tls crash on startup if more than one RS contexts are created in one process.