Merged revisions 317104 via svnmerge from