Merged revisions 276652 via svnmerge from