Merged revisions 42946 via svnmerge from