Merged revisions 242423 via svnmerge from