This will be the official pull request to fix thread-multiple on 1.8.4

Had merge conflicts on the other one - not entirely sure why, but it appears that maybe others were pushing things into it, and the branch got out-of-sync. Anyway, this has the complete and cleaned-up set of commits.