Merged revisions 38654 via svnmerge from