Merge pull request #2038 from magumagu/disable-thread-safety-checks Disable thread safety assertions added in PR1987.
