Merged revisions 123769 via svnmerge from