Merged revisions 99978 via svnmerge from