Merged revisions 109309 via svnmerge from