Merged revisions 102968 via svnmerge from