Merged revisions 317670 via svnmerge from