Merged revisions 42133 via svnmerge from