Previous attempt to fix the deadlock was incorrect. Really fixed the deadlock.
Previous attempt to fix the deadlock was incorrect. Really fixed the deadlock.

StevenLiekens/gw2pao,SamHurne/gw2pao,kirkerafael/gw2pao