Merged revisions 129343 via svnmerge from