Merged revisions 217806 via svnmerge from