Merged revisions 243258 via svnmerge from