Merged revisions 128812 via svnmerge from