Merged revisions 260923 via svnmerge from