Merged revisions 103324 via svnmerge from