Merged revisions 123909 via svnmerge from