Merge pull request #2260 from xmcclure/fix-testwaitany