Merged revisions 81403 via svnmerge from