Merged revisions 126999 via svnmerge from