Merged revisions 69183 via svnmerge from