Merge pull request #938 from TheBlueMatt/guirpcwin32