Merged revisions 126844 via svnmerge from