Merged revisions 103790 via svnmerge from