Merging in changes from upstream.
Updating Util.cs to use the Path.DirectorySeparatorChar member instead of
hard coded backslashes