Merged revisions 60712 via svnmerge from