Merged revisions 316331 via svnmerge from