Merged revisions 316193 via svnmerge from