Merged revisions 287388 via svnmerge from