Merged revisions 67121 via svnmerge from