Merged revisions 37856 via svnmerge from