Merged revisions 103786 via svnmerge from