Merged revisions 285017 via svnmerge from