Merged revisions 103823 via svnmerge from