Merged revisions 69012 via svnmerge from