Merged revisions 47192 via svnmerge from