Merge pull request #3008 from lateralusX/jlorenss/win-x64-shutdown-crash