Merged revisions 313658 via svnmerge from