Merged revisions 42697 via svnmerge from