Merged revisions 125476 via svnmerge from