Merged revisions 23705 via svnmerge from