Merged revisions 7736 via svnmerge from