Merged revisions 69181 via svnmerge from