Merged revisions 8729 via svnmerge from