Merged revisions 60936 via svnmerge from