Merged revisions 47864-47865 via svnmerge from