Merged revisions 317283 via svnmerge from