Merged revisions 101152 via svnmerge from