fix deadlock advised by flowly
Merge branch 'master' into udpcopy