Merge pull request #3503 from ntherning/fix-MarshalTest.GetHINSTANCE-on-mono-windows