Merged revisions 287863 via svnmerge from