Merged revisions 88283 via svnmerge from