Merged revisions 317917 via svnmerge from