Merge pull request #276 from bholmes/wsq-deadlock-12-04