Merged revisions 37173 via svnmerge from