Merged revisions 115308 via svnmerge from