Merged revisions 285369 via svnmerge from