Merged revisions 285386 via svnmerge from