Merged revisions 61407 via svnmerge from