Merged revisions 248859 via svnmerge from