Merged revisions 288927 via svnmerge from