Merged revisions 237318 via svnmerge from