Merged revisions 287897 via svnmerge from