Merged revisions 101894 via svnmerge from