Merged revisions 242520 via svnmerge from