Merged revisions 101480 via svnmerge from