Merged revisions 29464 via svnmerge from