Merged revisions 264248 via svnmerge from