Merged revisions 246115 via svnmerge from