Merged revisions 317058 via svnmerge from