Merged revisions 29969 via svnmerge from