Merged revisions 129970 via svnmerge from