merge
Merge remote-tracking branch 'github/trunk' into trunk
Merge remote-tracking branch 'github/trunk' into trunk
add configure test for __thread support, and flag to disable it