Merged revisions 313366 via svnmerge from