Merged revisions 287895 via svnmerge from