Merged revisions 40392 via svnmerge from