Merged revisions 108135 via svnmerge from