Merged revisions 287116 via svnmerge from