Merged revisions 316224 via svnmerge from