Merged revisions 123710 via svnmerge from