Merged revisions 264334 via svnmerge from