Merged revisions 42148 via svnmerge from