Merged revisions 315349 via svnmerge from