Merged revisions 314358 via svnmerge from