Merged revisions 247910 via svnmerge from