Merged revisions 315810 via svnmerge from