Merged revisions 317584 via svnmerge from