Merged revisions 100264 via svnmerge from