Merged revisions 287195 via svnmerge from