Merged revisions 42600 via svnmerge from