Merged revisions 101772 via svnmerge from