Merged revisions 76561 via svnmerge from