Merged revisions 315259 via svnmerge from