Merged revisions 69434 via svnmerge from