Merged revisions 125276 via svnmerge from