Merged revisions 102576 via svnmerge from