Merged revisions 314628 via svnmerge from