Merged revisions 29512 via svnmerge from