Merged revisions 122869 via svnmerge from