Merged revisions 111024 via svnmerge from