Completed merge with XML branch

Completed merge with XML branch.  Code builds & web methods work (as far
as I've tested).