Fix Crossplatform mapping for Windows#36

iddm merged 2 commits intoiddm:masteriddm/thread-priority:masterfrom

groscoe2:mastergroscoe2/thread-priority:masterCopy head branch name to clipboard