Merged revisions 316831 via svnmerge from