Merged revisions 71214 via svnmerge from