Merged revisions 286270 via svnmerge from