Merged revisions 126573 via svnmerge from