Refactoring to try to prevent deadlocks#1289

glindstedt wants to merge 3 commits intomainEmbarkStudios/quilkin:mainfrom

push-prlkrowxoomrEmbarkStudios/quilkin:push-prlkrowxoomrCopy head branch name to clipboard