Merged revisions 317865 via svnmerge from