Merged revisions 116409 via svnmerge from