Merged revisions 81416 via svnmerge from