Merged revisions 99594 via svnmerge from