Merged revisions 42355 via svnmerge from