Merged revisions 317837 via svnmerge from