deadlock passed to caller
Merge pull request #1467 from john-hill/PLFM-2923

deadlock passed to caller