Merge pull request #2373 from jdieter/master Reverts #2362 while still fixing deadlock when adding multiple Wiimotes
