Merged revisions 317427 via svnmerge from