Merged revisions 286588 via svnmerge from