test if conditional wait exists
Merge branch 'master' of github.com:woolstar/test