Merged revisions 263769 via svnmerge from