Merged revisions 69558 via svnmerge from