Merged revisions 81923 via svnmerge from