Merged revisions 245792 via svnmerge from