another attempt at fixing async problems (17969)
Merge branch 'master' of https://github.com/apmckinlay/csuneido.git