Merged revisions 38546-38547 via svnmerge from