Merged revisions 129907 via svnmerge from