Merged revisions 60398 via svnmerge from