Merged revisions 316709 via svnmerge from