Merged revisions 288748 via svnmerge from